Disconnect from the old adjustments signals. (#325869, Jorn Baayen)

2006-01-06  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkviewport.c (viewport_set_adjustment): Disconnect from
	the old adjustments signals.  (#325869, Jorn Baayen)

diff --git a/ChangeLog b/ChangeLog
index b4138238e2ed47719d3bcd103cc75d1bf85736ca..f90157990d8ea50c43d596a923f556f42f23a65a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-06  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkviewport.c (viewport_set_adjustment): Disconnect from
+       the old adjustments signals.  (#325869, Jorn Baayen)
+
 2006-01-06  Hans Breuer  <hans@breuer.org>
 
        * tests/makefile.msc : added a bunch of tests

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b4138238e2ed47719d3bcd103cc75d1bf85736ca..f90157990d8ea50c43d596a923f556f42f23a65a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-01-06  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkviewport.c (viewport_set_adjustment): Disconnect from
+       the old adjustments signals.  (#325869, Jorn Baayen)
+
 2006-01-06  Hans Breuer  <hans@breuer.org>
 
        * tests/makefile.msc : added a bunch of tests

diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c
index e89b2119e3774890c0121b6b1c8473bf37f5d508..be304a3affe6ca3bfcc686d3a8080e2c620f417d 100644 (file)
--- a/gtk/gtkviewport.c
+++ b/gtk/gtkviewport.c
@@ -464,8 +464,7 @@ viewport_set_adjustment (GtkViewport    *viewport,
   if (!adjustment)
     adjustment = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 0.0,
                                                     0.0, 0.0, 0.0));
-  if (*adjustmentp)
-    g_object_unref (*adjustmentp);
+  viewport_disconnect_adjustment (viewport, orientation);
   *adjustmentp = adjustment;
   g_object_ref_sink (adjustment);